Last push for java part
